Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 8 Jul 2005 12:22:18 +0000 (12:22 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 8 Jul 2005 12:22:18 +0000 (12:22 +0000)
commit0aee149922bd208872f13378b649eabecb09ebc9
tree77179aa623c12fb0d3f5c9a93eb29191ba08b1a3
parent59b2f965d41667a8407ad1a4f8b61aa20a1d2d47
parent847e60294d1886f390600baba5558c2f1a3727fc
Merge.
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/irq.c
xen/common/event_channel.c